Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 12 Feb 2011 22:40:06 +0000 (14:40 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 12 Feb 2011 22:40:06 +0000 (14:40 -0800)
commit265ca2fd8aaf56a92a1dfe909d72dce518e13f81
tree3faddf1720d3c705f4e6b14bf5c34cce2345e204
parent9312cc1038c21fdd3692a73de8d28d112b8d215f
parent5a940d86936e11047b280f05e7330e3f01bb9e25
Merge from mainline.
src/ChangeLog